diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index caa6038..fb516b0 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.MapConfigModel; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig() { + public void obtainMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MapConfigModel configBean = gson.fromJson(response, new TypeToken() { }.getType()); mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index caa6038..fb516b0 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.MapConfigModel; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig() { + public void obtainMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MapConfigModel configBean = gson.fromJson(response, new TypeToken() { }.getType()); mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java index b2b3439..f6c296e 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.CaseNextNodeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(String caseState) { + public void obtainNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseNextNodeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); nodeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index caa6038..fb516b0 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.MapConfigModel; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig() { + public void obtainMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MapConfigModel configBean = gson.fromJson(response, new TypeToken() { }.getType()); mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java index b2b3439..f6c296e 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.CaseNextNodeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(String caseState) { + public void obtainNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseNextNodeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); nodeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java index f485b50..a667ec3 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PersonStatusBean; @@ -9,6 +11,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -21,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(String deptid, String roleTips, String isOnLine) { + public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -38,11 +41,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PersonStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); personStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -51,7 +56,7 @@ }); } - public void obtainSubordinatePerson() { + public void obtainSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -68,11 +73,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ProcessPersonBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); processPersonModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index caa6038..fb516b0 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.MapConfigModel; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig() { + public void obtainMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MapConfigModel configBean = gson.fromJson(response, new TypeToken() { }.getType()); mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java index b2b3439..f6c296e 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.CaseNextNodeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(String caseState) { + public void obtainNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseNextNodeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); nodeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java index f485b50..a667ec3 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PersonStatusBean; @@ -9,6 +11,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -21,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(String deptid, String roleTips, String isOnLine) { + public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -38,11 +41,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PersonStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); personStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -51,7 +56,7 @@ }); } - public void obtainSubordinatePerson() { + public void obtainSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -68,11 +73,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ProcessPersonBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); processPersonModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index 43283bd..91eecb6 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PhoneBookBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData phoneBookModel = new MutableLiveData<>(); - public void obtainPhoneBook(String deptid) { + public void obtainPhoneBook(Context context, String deptid) { Observable observable = RetrofitServiceManager.getPhoneBook(deptid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PhoneBookBean phoneBookBean = gson.fromJson(response, new TypeToken() { }.getType()); phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index caa6038..fb516b0 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.MapConfigModel; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig() { + public void obtainMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MapConfigModel configBean = gson.fromJson(response, new TypeToken() { }.getType()); mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java index b2b3439..f6c296e 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.CaseNextNodeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(String caseState) { + public void obtainNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseNextNodeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); nodeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java index f485b50..a667ec3 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PersonStatusBean; @@ -9,6 +11,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -21,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(String deptid, String roleTips, String isOnLine) { + public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -38,11 +41,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PersonStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); personStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -51,7 +56,7 @@ }); } - public void obtainSubordinatePerson() { + public void obtainSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -68,11 +73,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ProcessPersonBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); processPersonModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index 43283bd..91eecb6 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PhoneBookBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData phoneBookModel = new MutableLiveData<>(); - public void obtainPhoneBook(String deptid) { + public void obtainPhoneBook(Context context, String deptid) { Observable observable = RetrofitServiceManager.getPhoneBook(deptid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PhoneBookBean phoneBookBean = gson.fromJson(response, new TypeToken() { }.getType()); phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java index 2f8c3f5..570b195 100644 --- a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.ActionResultBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData commonActionModel = new MutableLiveData<>(); - public void registerPush(String clientid) { + public void registerPush(Context context, String clientid) { Observable observable = RetrofitServiceManager.getRegisterResult(clientid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); commonActionModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index caa6038..fb516b0 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.MapConfigModel; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig() { + public void obtainMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MapConfigModel configBean = gson.fromJson(response, new TypeToken() { }.getType()); mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java index b2b3439..f6c296e 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.CaseNextNodeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(String caseState) { + public void obtainNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseNextNodeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); nodeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java index f485b50..a667ec3 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PersonStatusBean; @@ -9,6 +11,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -21,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(String deptid, String roleTips, String isOnLine) { + public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -38,11 +41,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PersonStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); personStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -51,7 +56,7 @@ }); } - public void obtainSubordinatePerson() { + public void obtainSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -68,11 +73,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ProcessPersonBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); processPersonModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index 43283bd..91eecb6 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PhoneBookBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData phoneBookModel = new MutableLiveData<>(); - public void obtainPhoneBook(String deptid) { + public void obtainPhoneBook(Context context, String deptid) { Observable observable = RetrofitServiceManager.getPhoneBook(deptid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PhoneBookBean phoneBookBean = gson.fromJson(response, new TypeToken() { }.getType()); phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java index 2f8c3f5..570b195 100644 --- a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.ActionResultBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData commonActionModel = new MutableLiveData<>(); - public void registerPush(String clientid) { + public void registerPush(Context context, String clientid) { Observable observable = RetrofitServiceManager.getRegisterResult(clientid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); commonActionModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 3860a02..ad33409 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData changeResultModel = new MutableLiveData<>(); - public void changeShopInfo(String merchantId, String merchantName, String contactName, String contactPhone, String images) { + public void changeShopInfo(Context context, String merchantId, String merchantName, String contactName, String contactPhone, String images) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getShopChangeResult(merchantId, merchantName, contactName, contactPhone, images); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -35,18 +35,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -54,7 +49,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index caa6038..fb516b0 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.MapConfigModel; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig() { + public void obtainMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MapConfigModel configBean = gson.fromJson(response, new TypeToken() { }.getType()); mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java index b2b3439..f6c296e 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.CaseNextNodeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(String caseState) { + public void obtainNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseNextNodeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); nodeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java index f485b50..a667ec3 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PersonStatusBean; @@ -9,6 +11,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -21,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(String deptid, String roleTips, String isOnLine) { + public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -38,11 +41,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PersonStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); personStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -51,7 +56,7 @@ }); } - public void obtainSubordinatePerson() { + public void obtainSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -68,11 +73,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ProcessPersonBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); processPersonModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index 43283bd..91eecb6 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PhoneBookBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData phoneBookModel = new MutableLiveData<>(); - public void obtainPhoneBook(String deptid) { + public void obtainPhoneBook(Context context, String deptid) { Observable observable = RetrofitServiceManager.getPhoneBook(deptid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PhoneBookBean phoneBookBean = gson.fromJson(response, new TypeToken() { }.getType()); phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java index 2f8c3f5..570b195 100644 --- a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.ActionResultBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData commonActionModel = new MutableLiveData<>(); - public void registerPush(String clientid) { + public void registerPush(Context context, String clientid) { Observable observable = RetrofitServiceManager.getRegisterResult(clientid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); commonActionModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 3860a02..ad33409 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData changeResultModel = new MutableLiveData<>(); - public void changeShopInfo(String merchantId, String merchantName, String contactName, String contactPhone, String images) { + public void changeShopInfo(Context context, String merchantId, String merchantName, String contactName, String contactPhone, String images) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getShopChangeResult(merchantId, merchantName, contactName, contactPhone, images); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -35,18 +35,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -54,7 +49,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index 81e0010..28c88b3 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.model.ToiletListModel; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -27,7 +27,7 @@ public MutableLiveData cleanToiletModel = new MutableLiveData<>(); public MutableLiveData cleanRecordModel = new MutableLiveData<>(); - public void getToilets() { + public void getToilets(Context context) { Observable observable = RetrofitServiceManager.getToilets(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -44,11 +44,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ToiletListModel listBean = gson.fromJson(response, new TypeToken() { }.getType()); toiletListModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -57,7 +59,7 @@ }); } - public void cleanToilet(String toiletId, String userId, String lng, String lat, String startTime, String endTime, String photo, String workContent) { + public void cleanToilet(Context context, String toiletId, String userId, String lng, String lat, String startTime, String endTime, String photo, String workContent) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCleanToiletResult(toiletId, userId, lng, lat, startTime, endTime, photo, workContent); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -69,18 +71,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -88,7 +85,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -97,7 +94,7 @@ }); } - public void obtainCleanRecordList(String userId, String keywords, String beginDate, String endDate, int offset) { + public void obtainCleanRecordList(Context context, String userId, String keywords, String beginDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCleanRecordResult(userId, keywords, beginDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -109,18 +106,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CleanRecordBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -128,7 +120,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index caa6038..fb516b0 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.MapConfigModel; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig() { + public void obtainMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MapConfigModel configBean = gson.fromJson(response, new TypeToken() { }.getType()); mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java index b2b3439..f6c296e 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.CaseNextNodeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(String caseState) { + public void obtainNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseNextNodeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); nodeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java index f485b50..a667ec3 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PersonStatusBean; @@ -9,6 +11,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -21,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(String deptid, String roleTips, String isOnLine) { + public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -38,11 +41,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PersonStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); personStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -51,7 +56,7 @@ }); } - public void obtainSubordinatePerson() { + public void obtainSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -68,11 +73,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ProcessPersonBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); processPersonModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index 43283bd..91eecb6 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PhoneBookBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData phoneBookModel = new MutableLiveData<>(); - public void obtainPhoneBook(String deptid) { + public void obtainPhoneBook(Context context, String deptid) { Observable observable = RetrofitServiceManager.getPhoneBook(deptid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PhoneBookBean phoneBookBean = gson.fromJson(response, new TypeToken() { }.getType()); phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java index 2f8c3f5..570b195 100644 --- a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.ActionResultBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData commonActionModel = new MutableLiveData<>(); - public void registerPush(String clientid) { + public void registerPush(Context context, String clientid) { Observable observable = RetrofitServiceManager.getRegisterResult(clientid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); commonActionModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 3860a02..ad33409 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData changeResultModel = new MutableLiveData<>(); - public void changeShopInfo(String merchantId, String merchantName, String contactName, String contactPhone, String images) { + public void changeShopInfo(Context context, String merchantId, String merchantName, String contactName, String contactPhone, String images) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getShopChangeResult(merchantId, merchantName, contactName, contactPhone, images); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -35,18 +35,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -54,7 +49,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index 81e0010..28c88b3 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.model.ToiletListModel; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -27,7 +27,7 @@ public MutableLiveData cleanToiletModel = new MutableLiveData<>(); public MutableLiveData cleanRecordModel = new MutableLiveData<>(); - public void getToilets() { + public void getToilets(Context context) { Observable observable = RetrofitServiceManager.getToilets(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -44,11 +44,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ToiletListModel listBean = gson.fromJson(response, new TypeToken() { }.getType()); toiletListModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -57,7 +59,7 @@ }); } - public void cleanToilet(String toiletId, String userId, String lng, String lat, String startTime, String endTime, String photo, String workContent) { + public void cleanToilet(Context context, String toiletId, String userId, String lng, String lat, String startTime, String endTime, String photo, String workContent) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCleanToiletResult(toiletId, userId, lng, lat, startTime, endTime, photo, workContent); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -69,18 +71,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -88,7 +85,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -97,7 +94,7 @@ }); } - public void obtainCleanRecordList(String userId, String keywords, String beginDate, String endDate, int offset) { + public void obtainCleanRecordList(Context context, String userId, String keywords, String beginDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCleanRecordResult(userId, keywords, beginDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -109,18 +106,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CleanRecordBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -128,7 +120,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index 401dd96..6da77c7 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -1,26 +1,29 @@ package com.casic.dcms.vm; +import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.Color; import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; -import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.annotations.WaterMarkPosition; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.FloatHub; +import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; +import com.pengxh.androidx.lite.utils.WaterMarkerEngine; import java.io.File; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -32,7 +35,7 @@ public MutableLiveData audioModel = new MutableLiveData<>(); public MutableLiveData videoModel = new MutableLiveData<>(); - public void uploadPosition(String imei, String positionLat, String positionLng) { + public void uploadPosition(Context context, String imei, String positionLat, String positionLng) { Observable observable = RetrofitServiceManager.getPositionUploadResult(imei, positionLat, positionLng); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -49,11 +52,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); commonActionModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -62,58 +67,63 @@ }); } - public void uploadImage(File file) { + public void uploadImage(Context context, File file) { + File compressImageDir = ContextHub.createCompressImageDir(context); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(bitmap, new IWaterMarkAddListener() { - @Override - public void onSuccess(File file) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.uploadImage(file); - ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { + new WaterMarkerEngine.Builder() + .setOriginalBitmap(bitmap) + .setTextMaker(LongHub.timestampToCompleteDate(System.currentTimeMillis()) + System.lineSeparator() + StringHelper.getUserBean().getAccount()) + .setTextColor(Color.RED) + .setTextSize(FloatHub.sp2px(context, 24)) + .setTextMargin(FloatHub.dp2px(context, 30)) + .setMarkerPosition(WaterMarkPosition.RIGHT_BOTTOM) + .setMarkedSavePath(compressImageDir + File.separator + System.currentTimeMillis() + ".png") + .setOnWaterMarkerAddedListener(new WaterMarkerEngine.OnWaterMarkerAddedListener() { @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); + public void onStart() { + } @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - imageModel.setValue(resultBean); + public void onMarkAdded(File file) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.uploadImage(file); + ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { + @Override + public void onCompleted() { loadState.setValue(LoadState.Success); - } else { + } + + @Override + public void onError(Throwable e) { loadState.setValue(LoadState.Fail); } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - @Override - public void onError(Throwable e) { - e.printStackTrace(); - } - }); + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.getResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + imageModel.setValue(resultBean); + loadState.setValue(LoadState.Success); + } else { + loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + }).build().start(); } - public void uploadAudio(File file) { + public void uploadAudio(Context context, File file) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.uploadAudio(file); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -125,18 +135,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -144,7 +149,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -153,7 +158,7 @@ }); } - public void uploadVideo(File file) { + public void uploadVideo(Context context, File file) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.uploadVideo(file); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -165,18 +170,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -184,7 +184,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index caa6038..fb516b0 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.MapConfigModel; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig() { + public void obtainMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MapConfigModel configBean = gson.fromJson(response, new TypeToken() { }.getType()); mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java index b2b3439..f6c296e 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.CaseNextNodeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(String caseState) { + public void obtainNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseNextNodeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); nodeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java index f485b50..a667ec3 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PersonStatusBean; @@ -9,6 +11,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -21,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(String deptid, String roleTips, String isOnLine) { + public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -38,11 +41,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PersonStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); personStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -51,7 +56,7 @@ }); } - public void obtainSubordinatePerson() { + public void obtainSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -68,11 +73,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ProcessPersonBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); processPersonModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index 43283bd..91eecb6 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PhoneBookBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData phoneBookModel = new MutableLiveData<>(); - public void obtainPhoneBook(String deptid) { + public void obtainPhoneBook(Context context, String deptid) { Observable observable = RetrofitServiceManager.getPhoneBook(deptid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PhoneBookBean phoneBookBean = gson.fromJson(response, new TypeToken() { }.getType()); phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java index 2f8c3f5..570b195 100644 --- a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.ActionResultBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData commonActionModel = new MutableLiveData<>(); - public void registerPush(String clientid) { + public void registerPush(Context context, String clientid) { Observable observable = RetrofitServiceManager.getRegisterResult(clientid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); commonActionModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 3860a02..ad33409 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData changeResultModel = new MutableLiveData<>(); - public void changeShopInfo(String merchantId, String merchantName, String contactName, String contactPhone, String images) { + public void changeShopInfo(Context context, String merchantId, String merchantName, String contactName, String contactPhone, String images) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getShopChangeResult(merchantId, merchantName, contactName, contactPhone, images); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -35,18 +35,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -54,7 +49,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index 81e0010..28c88b3 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.model.ToiletListModel; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -27,7 +27,7 @@ public MutableLiveData cleanToiletModel = new MutableLiveData<>(); public MutableLiveData cleanRecordModel = new MutableLiveData<>(); - public void getToilets() { + public void getToilets(Context context) { Observable observable = RetrofitServiceManager.getToilets(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -44,11 +44,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ToiletListModel listBean = gson.fromJson(response, new TypeToken() { }.getType()); toiletListModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -57,7 +59,7 @@ }); } - public void cleanToilet(String toiletId, String userId, String lng, String lat, String startTime, String endTime, String photo, String workContent) { + public void cleanToilet(Context context, String toiletId, String userId, String lng, String lat, String startTime, String endTime, String photo, String workContent) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCleanToiletResult(toiletId, userId, lng, lat, startTime, endTime, photo, workContent); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -69,18 +71,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -88,7 +85,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -97,7 +94,7 @@ }); } - public void obtainCleanRecordList(String userId, String keywords, String beginDate, String endDate, int offset) { + public void obtainCleanRecordList(Context context, String userId, String keywords, String beginDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCleanRecordResult(userId, keywords, beginDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -109,18 +106,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CleanRecordBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -128,7 +120,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index 401dd96..6da77c7 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -1,26 +1,29 @@ package com.casic.dcms.vm; +import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.Color; import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; -import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.annotations.WaterMarkPosition; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.FloatHub; +import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; +import com.pengxh.androidx.lite.utils.WaterMarkerEngine; import java.io.File; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -32,7 +35,7 @@ public MutableLiveData audioModel = new MutableLiveData<>(); public MutableLiveData videoModel = new MutableLiveData<>(); - public void uploadPosition(String imei, String positionLat, String positionLng) { + public void uploadPosition(Context context, String imei, String positionLat, String positionLng) { Observable observable = RetrofitServiceManager.getPositionUploadResult(imei, positionLat, positionLng); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -49,11 +52,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); commonActionModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -62,58 +67,63 @@ }); } - public void uploadImage(File file) { + public void uploadImage(Context context, File file) { + File compressImageDir = ContextHub.createCompressImageDir(context); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(bitmap, new IWaterMarkAddListener() { - @Override - public void onSuccess(File file) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.uploadImage(file); - ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { + new WaterMarkerEngine.Builder() + .setOriginalBitmap(bitmap) + .setTextMaker(LongHub.timestampToCompleteDate(System.currentTimeMillis()) + System.lineSeparator() + StringHelper.getUserBean().getAccount()) + .setTextColor(Color.RED) + .setTextSize(FloatHub.sp2px(context, 24)) + .setTextMargin(FloatHub.dp2px(context, 30)) + .setMarkerPosition(WaterMarkPosition.RIGHT_BOTTOM) + .setMarkedSavePath(compressImageDir + File.separator + System.currentTimeMillis() + ".png") + .setOnWaterMarkerAddedListener(new WaterMarkerEngine.OnWaterMarkerAddedListener() { @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); + public void onStart() { + } @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - imageModel.setValue(resultBean); + public void onMarkAdded(File file) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.uploadImage(file); + ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { + @Override + public void onCompleted() { loadState.setValue(LoadState.Success); - } else { + } + + @Override + public void onError(Throwable e) { loadState.setValue(LoadState.Fail); } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - @Override - public void onError(Throwable e) { - e.printStackTrace(); - } - }); + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.getResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + imageModel.setValue(resultBean); + loadState.setValue(LoadState.Success); + } else { + loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + }).build().start(); } - public void uploadAudio(File file) { + public void uploadAudio(Context context, File file) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.uploadAudio(file); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -125,18 +135,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -144,7 +149,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -153,7 +158,7 @@ }); } - public void uploadVideo(File file) { + public void uploadVideo(Context context, File file) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.uploadVideo(file); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -165,18 +170,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -184,7 +184,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java index ca64e7c..0a172c2 100644 --- a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LoginResultBean; import com.casic.dcms.model.UserBean; @@ -18,10 +19,8 @@ import com.pengxh.androidx.lite.utils.SaveKeyValues; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; -import retrofit2.HttpException; import rx.Observable; public class UserViewModel extends BaseViewModel { @@ -33,7 +32,7 @@ public MutableLiveData changePwdResult = new MutableLiveData<>(); public MutableLiveData updateResult = new MutableLiveData<>(); - public void getUserData() { + public void getUserData(Context context) { Observable observable = RetrofitServiceManager.getUserData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -50,7 +49,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UserBean userBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -70,7 +69,7 @@ }); } - public void login(String username, String key) { + public void login(Context context, String username, String key) { loadState.setValue(LoadState.Loading); Observable loginObservable = RetrofitServiceManager.login(username, key); ObserverSubscriber.addSubscribe(loginObservable, new ObserverSubscriber.OnObserverCallback() { @@ -82,21 +81,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - //TODO 最好是通过错误码判断，但是需要后台配合修改 - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else if (e instanceof HttpException) { - StringHub.show(BaseApplication.get(), "用户已锁定，请联系管理员"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LoginResultBean loginResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -104,7 +95,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -113,7 +104,7 @@ }); } - public void loginOut() { + public void loginOut(Context context) { Observable observable = RetrofitServiceManager.loginOut(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -130,11 +121,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); loginOutResult.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -143,7 +136,7 @@ }); } - public void changePassword(String oldPwd, String newPwd) { + public void changePassword(Context context, String oldPwd, String newPwd) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getChangePasswordResult(oldPwd, newPwd); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -155,18 +148,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -174,7 +162,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -183,7 +171,7 @@ }); } - public void updateUserInfo(String id, String account, String name, String deptid, String roleid, String avatar, String sex, String birthday, String phone) { + public void updateUserInfo(Context context, String id, String account, String name, String deptid, String roleid, String avatar, String sex, String birthday, String phone) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.updateUserInfo(id, account, name, deptid, roleid, avatar, sex, birthday, phone); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -195,18 +183,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -214,7 +197,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index caa6038..fb516b0 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.MapConfigModel; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig() { + public void obtainMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MapConfigModel configBean = gson.fromJson(response, new TypeToken() { }.getType()); mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java index b2b3439..f6c296e 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.CaseNextNodeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(String caseState) { + public void obtainNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseNextNodeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); nodeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java index f485b50..a667ec3 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PersonStatusBean; @@ -9,6 +11,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -21,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(String deptid, String roleTips, String isOnLine) { + public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -38,11 +41,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PersonStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); personStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -51,7 +56,7 @@ }); } - public void obtainSubordinatePerson() { + public void obtainSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -68,11 +73,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ProcessPersonBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); processPersonModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index 43283bd..91eecb6 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PhoneBookBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData phoneBookModel = new MutableLiveData<>(); - public void obtainPhoneBook(String deptid) { + public void obtainPhoneBook(Context context, String deptid) { Observable observable = RetrofitServiceManager.getPhoneBook(deptid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PhoneBookBean phoneBookBean = gson.fromJson(response, new TypeToken() { }.getType()); phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java index 2f8c3f5..570b195 100644 --- a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.ActionResultBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData commonActionModel = new MutableLiveData<>(); - public void registerPush(String clientid) { + public void registerPush(Context context, String clientid) { Observable observable = RetrofitServiceManager.getRegisterResult(clientid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); commonActionModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 3860a02..ad33409 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData changeResultModel = new MutableLiveData<>(); - public void changeShopInfo(String merchantId, String merchantName, String contactName, String contactPhone, String images) { + public void changeShopInfo(Context context, String merchantId, String merchantName, String contactName, String contactPhone, String images) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getShopChangeResult(merchantId, merchantName, contactName, contactPhone, images); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -35,18 +35,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -54,7 +49,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index 81e0010..28c88b3 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.model.ToiletListModel; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -27,7 +27,7 @@ public MutableLiveData cleanToiletModel = new MutableLiveData<>(); public MutableLiveData cleanRecordModel = new MutableLiveData<>(); - public void getToilets() { + public void getToilets(Context context) { Observable observable = RetrofitServiceManager.getToilets(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -44,11 +44,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ToiletListModel listBean = gson.fromJson(response, new TypeToken() { }.getType()); toiletListModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -57,7 +59,7 @@ }); } - public void cleanToilet(String toiletId, String userId, String lng, String lat, String startTime, String endTime, String photo, String workContent) { + public void cleanToilet(Context context, String toiletId, String userId, String lng, String lat, String startTime, String endTime, String photo, String workContent) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCleanToiletResult(toiletId, userId, lng, lat, startTime, endTime, photo, workContent); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -69,18 +71,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -88,7 +85,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -97,7 +94,7 @@ }); } - public void obtainCleanRecordList(String userId, String keywords, String beginDate, String endDate, int offset) { + public void obtainCleanRecordList(Context context, String userId, String keywords, String beginDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCleanRecordResult(userId, keywords, beginDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -109,18 +106,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CleanRecordBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -128,7 +120,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index 401dd96..6da77c7 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -1,26 +1,29 @@ package com.casic.dcms.vm; +import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.Color; import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; -import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.annotations.WaterMarkPosition; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.FloatHub; +import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; +import com.pengxh.androidx.lite.utils.WaterMarkerEngine; import java.io.File; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -32,7 +35,7 @@ public MutableLiveData audioModel = new MutableLiveData<>(); public MutableLiveData videoModel = new MutableLiveData<>(); - public void uploadPosition(String imei, String positionLat, String positionLng) { + public void uploadPosition(Context context, String imei, String positionLat, String positionLng) { Observable observable = RetrofitServiceManager.getPositionUploadResult(imei, positionLat, positionLng); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -49,11 +52,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); commonActionModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -62,58 +67,63 @@ }); } - public void uploadImage(File file) { + public void uploadImage(Context context, File file) { + File compressImageDir = ContextHub.createCompressImageDir(context); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(bitmap, new IWaterMarkAddListener() { - @Override - public void onSuccess(File file) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.uploadImage(file); - ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { + new WaterMarkerEngine.Builder() + .setOriginalBitmap(bitmap) + .setTextMaker(LongHub.timestampToCompleteDate(System.currentTimeMillis()) + System.lineSeparator() + StringHelper.getUserBean().getAccount()) + .setTextColor(Color.RED) + .setTextSize(FloatHub.sp2px(context, 24)) + .setTextMargin(FloatHub.dp2px(context, 30)) + .setMarkerPosition(WaterMarkPosition.RIGHT_BOTTOM) + .setMarkedSavePath(compressImageDir + File.separator + System.currentTimeMillis() + ".png") + .setOnWaterMarkerAddedListener(new WaterMarkerEngine.OnWaterMarkerAddedListener() { @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); + public void onStart() { + } @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - imageModel.setValue(resultBean); + public void onMarkAdded(File file) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.uploadImage(file); + ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { + @Override + public void onCompleted() { loadState.setValue(LoadState.Success); - } else { + } + + @Override + public void onError(Throwable e) { loadState.setValue(LoadState.Fail); } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - @Override - public void onError(Throwable e) { - e.printStackTrace(); - } - }); + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.getResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + imageModel.setValue(resultBean); + loadState.setValue(LoadState.Success); + } else { + loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + }).build().start(); } - public void uploadAudio(File file) { + public void uploadAudio(Context context, File file) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.uploadAudio(file); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -125,18 +135,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -144,7 +149,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -153,7 +158,7 @@ }); } - public void uploadVideo(File file) { + public void uploadVideo(Context context, File file) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.uploadVideo(file); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -165,18 +170,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -184,7 +184,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java index ca64e7c..0a172c2 100644 --- a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LoginResultBean; import com.casic.dcms.model.UserBean; @@ -18,10 +19,8 @@ import com.pengxh.androidx.lite.utils.SaveKeyValues; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; -import retrofit2.HttpException; import rx.Observable; public class UserViewModel extends BaseViewModel { @@ -33,7 +32,7 @@ public MutableLiveData changePwdResult = new MutableLiveData<>(); public MutableLiveData updateResult = new MutableLiveData<>(); - public void getUserData() { + public void getUserData(Context context) { Observable observable = RetrofitServiceManager.getUserData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -50,7 +49,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UserBean userBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -70,7 +69,7 @@ }); } - public void login(String username, String key) { + public void login(Context context, String username, String key) { loadState.setValue(LoadState.Loading); Observable loginObservable = RetrofitServiceManager.login(username, key); ObserverSubscriber.addSubscribe(loginObservable, new ObserverSubscriber.OnObserverCallback() { @@ -82,21 +81,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - //TODO 最好是通过错误码判断，但是需要后台配合修改 - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else if (e instanceof HttpException) { - StringHub.show(BaseApplication.get(), "用户已锁定，请联系管理员"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LoginResultBean loginResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -104,7 +95,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -113,7 +104,7 @@ }); } - public void loginOut() { + public void loginOut(Context context) { Observable observable = RetrofitServiceManager.loginOut(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -130,11 +121,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); loginOutResult.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -143,7 +136,7 @@ }); } - public void changePassword(String oldPwd, String newPwd) { + public void changePassword(Context context, String oldPwd, String newPwd) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getChangePasswordResult(oldPwd, newPwd); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -155,18 +148,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -174,7 +162,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -183,7 +171,7 @@ }); } - public void updateUserInfo(String id, String account, String name, String deptid, String roleid, String avatar, String sex, String birthday, String phone) { + public void updateUserInfo(Context context, String id, String account, String name, String deptid, String roleid, String avatar, String sex, String birthday, String phone) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.updateUserInfo(id, account, name, deptid, roleid, avatar, sex, birthday, phone); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -195,18 +183,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -214,7 +197,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java index 0c28086..e1d127c 100644 --- a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.NewVersionBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData versionModel = new MutableLiveData<>(); - public void update() { + public void update(Context context) { loadState.setValue(LoadState.Loading); Observable loginObservable = RetrofitServiceManager.updateVersion(); ObserverSubscriber.addSubscribe(loginObservable, new ObserverSubscriber.OnObserverCallback() { @@ -35,18 +35,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { NewVersionBean versionBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -54,7 +49,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index e5b431b..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -39,7 +39,6 @@ } }); initDataBase(); - //TODO CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index 0dcad99..2dce1f5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -80,7 +80,7 @@ //首页相关功能项 HomePageViewModel homePageViewModel = new ViewModelProvider(this).get(HomePageViewModel.class); - homePageViewModel.obtainHomePageData("05"); + homePageViewModel.obtainHomePageData(requireContext(), "05"); homePageViewModel.homePageDataModel.observe(this, new Observer() { @Override public void onChanged(HomePageBean resultBean) { @@ -182,7 +182,7 @@ //获取用户信息之后保存登录时间 SaveKeyValues.putValue(LocaleConstant.LAST_LOGIN, LongHub.timestampToCompleteDate(System.currentTimeMillis())); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index 01981b6..04ef284 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -64,7 +64,7 @@ } private void obtainLightList() { - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -181,7 +181,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } @@ -189,7 +189,7 @@ } else if (msg.what == 20210624) { isRefresh = true; pageIndex = 1; - lightViewModel.obtainLightList(2 * LocaleConstant.PAGE_LIMIT, pageIndex); + lightViewModel.obtainLightList(requireContext(), 2 * LocaleConstant.PAGE_LIMIT, pageIndex); } return true; } diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java index 3b82ecf..f344da3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnMapFragment.java @@ -87,7 +87,7 @@ lightLocalBeanDao = BaseApplication.getDaoSession().getLightLocalBeanDao(); lightViewModel = new ViewModelProvider(this).get(LightViewModel.class); - lightViewModel.obtainLightOnMap(); + lightViewModel.obtainLightOnMap(requireContext()); lightViewModel.lightMapModel.observe(this, new Observer() { @Override public void onChanged(LightMapBean resultBean) { @@ -382,7 +382,7 @@ } else { controlType = "0"; } - lightViewModel.controlLight(lampIds, controlType); + lightViewModel.controlLight(requireContext(), lampIds, controlType); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index e1d3849..414a3c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -127,7 +127,7 @@ public void onChanged(ActionResultBean resultBean) { if (resultBean.getCode() == 200) { //更新用户信息表 - userViewModel.updateUserInfo(user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); + userViewModel.updateUserInfo(requireContext(), user.getId(), user.getAccount(), user.getName(), user.getDeptId(), StringHelper.reformatURL(user.getRoleList()), resultBean.getData(), "", "", ""); Glide.with(requireContext()).load(StringHelper.appendCompleteURL(resultBean.getData())).apply(RequestOptions.circleCropTransform()).into(getBinding().userImageView); } @@ -153,7 +153,7 @@ getBinding().updateUserButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } }); @@ -188,7 +188,7 @@ PictureSelectorHelper.selectPicture(requireContext(), 1, new ISelectorListener() { @Override public void onSuccess(ArrayList result) { - uploadViewModel.uploadImage(new File(result.get(0).getRealPath())); + uploadViewModel.uploadImage(requireContext(), new File(result.get(0).getRealPath())); } }); } @@ -204,7 +204,7 @@ StringHub.show(requireContext(), "复制成功"); } }); - getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update()); + getBinding().updateVersionView.setOnClickListener(v -> versionViewModel.update(requireContext())); getBinding().loginOutButton.setOnClickListener(new View.OnClickListener() { @Override @@ -212,7 +212,7 @@ new AlertControlDialog.Builder().setContext(requireContext()).setTitle("退出登录").setMessage("确定要退出吗？").setNegativeButton("取消").setPositiveButton("确定").setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - userViewModel.loginOut(); + userViewModel.loginOut(requireContext()); } @Override @@ -227,7 +227,7 @@ @Override public void onResume() { super.onResume(); - userViewModel.getUserData(); + userViewModel.getUserData(requireContext()); } //下载apk diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java index 334e25c..164c129 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonListFragment.java @@ -34,7 +34,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); onlinePersonAdapter = new PersonListAdapter(requireContext()); } diff --git a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java index 199e585..a4b13f9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PersonOnMapFragment.java @@ -63,7 +63,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); statusViewModel = new ViewModelProvider(this).get(PersonViewModel.class); - statusViewModel.obtainPersonByStatus("", "", ""); + statusViewModel.obtainPersonByStatus(requireContext(), "", "", ""); getBinding().mapView.setAttributionTextVisible(false); //去掉左下角属性标识 getBinding().mapView.setViewpointScaleAsync(64000.0); diff --git a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java index b0bbda9..115fcbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/PhonePageFragment.java @@ -45,7 +45,7 @@ phoneBookViewModel = new ViewModelProvider(this).get(PhoneBookViewModel.class); expandableAdapter = new DeptExpandableAdapter(requireContext()); - deptTreeViewModel.obtainDeptTree("0"); + deptTreeViewModel.obtainDeptTree(requireContext(), "0"); } @Override @@ -66,7 +66,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookViewModel.obtainPhoneBook(StringHelper.getUserBean().getDeptId()); + phoneBookViewModel.obtainPhoneBook(requireContext(), StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3edc7b8..ce51012 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -58,7 +58,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, true); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 625e86f..bfebdbf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -59,7 +59,7 @@ } public void obtainPackageCaseList() { - caseViewModel.obtainShopCaseList("1", pageIndex, false); + caseViewModel.obtainShopCaseList(requireContext(), "1", pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index 5f74555..979c2af 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -88,7 +88,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index 65595cd..cfbd747 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -89,7 +89,7 @@ } private void obtainCheckCaseList() { - caseViewModel.obtainCheckCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index f44c0dd..2c1b24d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 36ad4c9..093ac78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDeptStatusCaseList(pageIndex, false); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 4340eb8..56a9ded 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, true); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 65d1b3c..d49623d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -86,7 +86,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "handled"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "handled"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index b1e105b..e1b03e3 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -80,7 +80,7 @@ public void onResume() { super.onResume(); pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } @Override @@ -91,7 +91,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -99,7 +99,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } @@ -113,7 +113,7 @@ @Override public void onClick(View v) { pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + handleViewModel.obtainDelayedOrPostCaseList(requireContext(), pageIndex, false); } }); } else { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 0fc35d7..3b51bc0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -85,7 +85,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "process"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "process"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index f5da924..163e9bf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainDeptStatusCaseList() { - handleViewModel.obtainDeptStatusCaseList(pageIndex, "todo"); + handleViewModel.obtainDeptStatusCaseList(requireContext(), pageIndex, "todo"); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index 394e8e1..02d5216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -85,7 +85,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandledCaseList(pageIndex); + caseViewModel.obtainHandledCaseList(requireContext(), pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 529a070..da6d89f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -87,7 +87,7 @@ } private void obtainHandleCaseList() { - caseViewModel.obtainHandleCaseList(pageIndex, false); + caseViewModel.obtainHandleCaseList(requireContext(), pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 1618a74..9699f83 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("1", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 2855325..1fd6397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainOvertimeCaseList("0", pageIndex); + caseViewModel.obtainOvertimeCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 9ff9c99..86304c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("1", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "1", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index 52a94e6..ab0f277 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -86,7 +86,7 @@ private void obtainUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办，1-已督办 - caseViewModel.obtainUrgentCaseList("0", pageIndex); + caseViewModel.obtainUrgentCaseList(requireContext(), "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index 80eb0b0..2fed724 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -88,7 +88,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index fb7601e..e2be630 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -89,7 +89,7 @@ } public void obtainVerifyCaseList() { - caseViewModel.obtainVerifyCaseList(LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.obtainVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java b/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java deleted file mode 100644 index f25a026..0000000 --- a/app/src/main/java/com/casic/dcms/model/ErrorMessageModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.model; - -public class ErrorMessageModel { - private int code; - private String data; - private String exceptionClazz; - private String message; - private boolean isSuccess; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getExceptionClazz() { - return exceptionClazz; - } - - public void setExceptionClazz(String exceptionClazz) { - this.exceptionClazz = exceptionClazz; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean success) { - isSuccess = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java deleted file mode 100644 index 615c581..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.casic.dcms.utils; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Environment; -import android.text.TextPaint; - -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; -import com.pengxh.androidx.lite.hub.ContextHub; -import com.pengxh.androidx.lite.hub.FloatHub; -import com.pengxh.androidx.lite.hub.IntHub; -import com.pengxh.androidx.lite.hub.LongHub; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - -import rx.Emitter; -import rx.Observable; -import rx.Observer; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; -import top.zibin.luban.Luban; -import top.zibin.luban.OnCompressListener; - -public class ImageHelper { - private static final String TAG = "ImageHelper"; - - /** - * 绘制文字到右下角并压缩图片 - */ - public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.get(); - //初始化画笔 - TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); - textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 - textPaint.setColor(Color.RED); - textPaint.setDither(true); // 防抖动，获取更清晰的图像采样 - textPaint.setFilterBitmap(true);// 滤波 - - String name = StringHelper.getUserBean().getAccount(); - String date = LongHub.timestampToDate(System.currentTimeMillis()); - String time = LongHub.timestampToTime(System.currentTimeMillis()); - - Observable.create(emitter -> { - //图片像素不一样，字体也需要设置不一样,像素低的图片，文字要小 - textPaint.setTextSize(FloatHub.dp2px(context, 16)); - Rect nameBounds = new Rect(); - textPaint.getTextBounds(name, 0, name.length(), nameBounds); - Rect dateBounds = new Rect(); - textPaint.getTextBounds(date, 0, date.length(), dateBounds); - Rect timeBounds = new Rect(); - textPaint.getTextBounds(time, 0, time.length(), timeBounds); - - //添加水印 - Bitmap.Config bitmapConfig = bitmap.getConfig(); - if (bitmapConfig == null) { - bitmapConfig = Bitmap.Config.RGB_565; - } - Bitmap copyBitmap = bitmap.copy(bitmapConfig, true); - - Canvas canvas = new Canvas(copyBitmap); - final int bitmapWidth = copyBitmap.getWidth(); - final int bitmapHeight = copyBitmap.getHeight(); - - //图片像素不一样，间距也需要设置不一样 - int padding, paddingRight, paddingBottom; - padding = IntHub.dp2px(context, 8);//两行水印间的间距 - paddingRight = IntHub.dp2px(context, 12); - paddingBottom = IntHub.dp2px(context, 12); - //有几行就写几行 - canvas.drawText(name, bitmapWidth - nameBounds.width() - paddingRight, - bitmapHeight - (dateBounds.height() + timeBounds.height() + 2 * padding + paddingBottom), textPaint); - canvas.drawText(date, bitmapWidth - dateBounds.width() - paddingRight, - bitmapHeight - (timeBounds.height() + padding + paddingBottom), textPaint); - canvas.drawText(time, bitmapWidth - timeBounds.width() - paddingRight, - bitmapHeight - paddingBottom, textPaint); - - //将带有水印的图片保存 - File waterImageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "WaterImage"); - if (!waterImageDir.exists()) { - waterImageDir.mkdir(); - } - String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - //index用来区分for循环太快会导致多想图片覆盖压缩问题 - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); - if (!imageFile.exists()) { - try { - imageFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - try { - FileOutputStream fos = new FileOutputStream(imageFile); - //以jpeg的编码方式，75%的像素质量保存为png图片 - copyBitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos); - fos.flush(); - fos.close(); - if (!copyBitmap.isRecycled()) { - copyBitmap.recycle(); - } - } catch (Exception e) { - e.printStackTrace(); - } - emitter.onNext(imageFile); - }, Emitter.BackpressureMode.BUFFER).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(File file) { - if (file != null) { - //压缩 - compressImage(context, file, markAddListener); - } else { - markAddListener.onError(new NullPointerException()); - } - } - }); - } - - private static void compressImage(Context context, File file, IWaterMarkAddListener markAddListener) { - Luban.with(context) - .load(file.getAbsolutePath()) - .ignoreBy(100) - .setTargetDir(ContextHub.createCompressImageDir(context).toString()) - .setCompressListener(new OnCompressListener() { - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - markAddListener.onSuccess(file); - } - - @Override - public void onError(Throwable e) { - markAddListener.onError(e); - } - }).launch(); - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 6e0d8ee..5ecf192 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,18 +4,15 @@ import android.util.Log; import com.casic.dcms.R; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.BridgeConfigBean; -import com.casic.dcms.model.ErrorMessageModel; import com.casic.dcms.model.UserBean; import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.SaveKeyValues; -import org.json.JSONException; -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; @@ -175,23 +172,22 @@ return s; } - public static int separateResponseCode(String value) { + public static int getResponseCode(String value) { if (value.isEmpty()) { return 404; } - int code = 500; - try { - code = new JSONObject(value).getInt("code"); - } catch (JSONException e) { - e.printStackTrace(); - } - return code; + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("code").getAsInt(); } - public static void showErrorMessage(String value) { - ErrorMessageModel errorModel = new Gson().fromJson(value, new TypeToken() { - }.getType()); - StringHub.show(BaseApplication.get(), errorModel.getMessage()); + public static String getResponseMessage(String value) { + if (value.isEmpty()) { + return ""; + } + JsonElement element = JsonParser.parseString(value); + JsonObject jsonObject = element.getAsJsonObject(); + return jsonObject.get("message").getAsString(); } /** diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index c7f04ce..42a7df9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -73,7 +73,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -264,8 +264,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java index 385036f..03e21f9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseProcessActivity.java @@ -56,7 +56,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String processId = getIntent().getStringExtra(Constant.INTENT_PARAM); commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); - commonDataViewModel.obtainCaseProcess(processId); + commonDataViewModel.obtainCaseProcess(this, processId); commonDataViewModel.caseProcessModel.observe(this, new Observer() { @Override public void onChanged(CaseProcessBean resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index c3725dc..2147693 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 75f30db..4f5d84a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -96,7 +96,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -239,7 +239,7 @@ binding.caseCommonSentenceLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonViewModel.obtainCommonSentence(); + commonViewModel.obtainCommonSentence(context); } }); @@ -251,7 +251,7 @@ StringHub.show(context, "督办意见不能为空"); return; } - operateViewModel.updateCaseSupervise(id, remarks); + operateViewModel.updateCaseSupervise(context, id, remarks); } }); } @@ -283,8 +283,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 23ebc15..26b23e9 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -74,7 +74,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -221,8 +221,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java index 42d124d..093668b 100644 --- a/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/ChangePasswordActivity.java @@ -141,7 +141,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(AuthenticationHelper.getPublicKey()); String oldPassKey = RSAUtils.encryptDataByPublicKey(oldPassword.getBytes(StandardCharsets.UTF_8), publicKey); String newPassKey = RSAUtils.encryptDataByPublicKey(newPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.changePassword(oldPassKey, newPassKey); + userViewModel.changePassword(context, oldPassKey, newPassKey); } }); userViewModel.changePwdResult.observe(this, new Observer() { diff --git a/app/src/main/java/com/casic/dcms/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/view/LoginActivity.java index 14ffe4a..f946aa1 100644 --- a/app/src/main/java/com/casic/dcms/view/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/view/LoginActivity.java @@ -70,7 +70,7 @@ PublicKey publicKey = RSAUtils.keyStrToPublicKey(keyString); String dataByPublicKey = RSAUtils.encryptDataByPublicKey(userPassword.getBytes(StandardCharsets.UTF_8), publicKey); - userViewModel.login(account, dataByPublicKey); + userViewModel.login(context, account, dataByPublicKey); } } }); @@ -84,7 +84,7 @@ /** * 获取token之后保存用户信息 * */ - userViewModel.getUserData(); + userViewModel.getUserData(context); //验证成功登录 ContextHub.navigatePageTo(context, MainActivity.class); finish(); @@ -111,7 +111,7 @@ SaveKeyValues.putValue(LocaleConstant.ACCOUNT, account); SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword); - authenticateViewModel.obtainPublicKey(); + authenticateViewModel.obtainPublicKey(context); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 59d01ab..694b22d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.view; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -54,6 +55,7 @@ private static final String TAG = "MainActivity"; public static WeakReferenceHandler weakReferenceHandler; + private final Context context = this; private DataBaseManager dataBaseManager; private final Gson gson = new Gson(); private final List pageViews = new ArrayList<>(); @@ -81,14 +83,14 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.PUSH_REGISTER) { - pushViewModel.registerPush((String) msg.obj); + pushViewModel.registerPush(context, (String) msg.obj); } else if (msg.what == LocaleConstant.MESSAGE_NUMBER) { updateMessageNumber(); } else if (msg.what == LocaleConstant.UPDATE_LOCATION) { AMapLocation aMapLocation = (AMapLocation) msg.obj; try { double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - positionViewModel.uploadPosition(imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); + positionViewModel.uploadPosition(context, imei, String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } @@ -112,7 +114,7 @@ dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); - mapConfigViewModel.obtainMapConfig(); + mapConfigViewModel.obtainMapConfig(this); mapConfigViewModel.mapConfigModel.observe(this, new Observer() { @Override public void onChanged(MapConfigModel resultBean) { @@ -126,7 +128,7 @@ }); ToiletViewModel toiletViewModel = new ViewModelProvider(this).get(ToiletViewModel.class); - toiletViewModel.getToilets(); + toiletViewModel.getToilets(this); toiletViewModel.toiletListModel.observe(this, new Observer() { @Override public void onChanged(ToiletListModel resultBean) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index 3bac366..fde999f 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -153,7 +153,7 @@ eorc = String.valueOf(position + 1); //获取案卷大类 - commonDataViewModel.obtainLargeType(eorc); + commonDataViewModel.obtainLargeType(context, eorc); } }).build().show(); } @@ -179,7 +179,7 @@ //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); typeCode = dataBean.getTypeCode(); } }).build().show(); @@ -217,7 +217,7 @@ binding.caseStatusLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - commonDataViewModel.obtainCaseStatus(); + commonDataViewModel.obtainCaseStatus(context); } }); diff --git a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java index 5559d48..3d45dff 100644 --- a/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SplashScreenActivity.java @@ -27,7 +27,7 @@ @Override public void onFinish() { - userViewModel.getUserData(); + userViewModel.getUserData(context); } }; diff --git a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java index 59275b7..a5cc7c2 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/BridgeMaintainActivity.java @@ -172,7 +172,7 @@ //提交养护记录 bridgeViewModel.submitMaintain( - bridgeId, + context, bridgeId, maintainContent, binding.maintainDateView.getText().toString(), StringHelper.getUserBean().getId(), diff --git a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java index a6b6ddb..9cc6cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/bridge/MaintainRecordActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.bridge; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; @@ -20,6 +21,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -136,7 +138,7 @@ } private void obtainMaintainRecord(String start, String end) { - bridgeViewModel.obtainMaintainRecord(start, end, pageIndex); + bridgeViewModel.obtainMaintainRecord(this, start, end, pageIndex); } private final Handler.Callback callback = msg -> { @@ -171,8 +173,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; - //TODO -// binding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.recordRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index 46fdf9f..b0319d6 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -131,7 +131,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -229,7 +229,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - shopViewModel.changeShopInfo(merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); + shopViewModel.changeShopInfo(context, merchantId, merchantName, shopKeeper, phoneNumber, StringHelper.reformatURL(imageList)); } }); } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index 1f8adb5..34318f3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -52,7 +52,7 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 9a7cff6..ab46e0f 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -107,7 +107,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); //下级结点 @@ -213,7 +213,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); nodeViewModel.nodeModel.observe(this, new Observer() { @@ -371,7 +371,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 648e15b..3b54516 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -53,6 +54,7 @@ public class CheckDetailActivity extends AndroidxBaseActivity { + private static final String TAG = "CheckDetailActivity"; private final Context context = CheckDetailActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 private final ArrayList imageList = new ArrayList<>(); //上传到服务器的数据集 @@ -126,7 +128,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -175,7 +177,9 @@ if (!TextUtils.isEmpty(audioFile)) { binding.audioPlayerView.setVisibility(View.VISIBLE); //TODO -// binding.audioPlayerView.setAudioSource(StringHelper.appendCompleteURL(audioFile)); + String url = StringHelper.appendCompleteURL(audioFile); + Log.d(TAG, "onChanged: " + url); +// binding.audioPlayerView.setAudioSource(); } //视频 @@ -366,7 +370,7 @@ binding.caseCheckLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -387,7 +391,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.checkCase(data.getProcessId(), id, + operateViewModel.checkCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList) ); @@ -406,7 +410,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -436,8 +440,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 40b41b5..6ecbbde 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -271,8 +271,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index d69cf3e..bcea1a6 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -359,7 +359,7 @@ StringHub.show(context, "不同意/同意的意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -392,8 +392,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index 6d35b66..2a127e4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -108,7 +108,7 @@ id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -230,9 +230,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -373,7 +373,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -406,8 +406,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index a594bf2..5f169a8 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -106,7 +106,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -228,9 +228,9 @@ } //获取处置类型 - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); //获取下级处置人员 - personViewModel.obtainSubordinatePerson(); + personViewModel.obtainSubordinatePerson(context); } } }); @@ -367,7 +367,7 @@ StringHub.show(context, "处理意见必须填写"); return; } - operateViewModel.dispatcherHandleCase(data.getProcessId(), id, + operateViewModel.dispatcherHandleCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, optionInput, "", operationKey, taskUserId); } }); @@ -400,8 +400,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f7b6cee..45fe5f9 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -130,7 +130,7 @@ id = getIntent().getStringExtra("id"); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -297,7 +297,7 @@ binding.caseHandleResultLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -371,7 +371,7 @@ return; } } - operateViewModel.handleOvertimeCase( + operateViewModel.handleOvertimeCase(context, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult ); @@ -390,7 +390,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } @Override @@ -420,8 +420,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 3b285d7..cf84e27 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -76,7 +76,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -242,8 +242,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index 2774e3b..fcb9d25 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(context, 1, true); binding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 binding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(1, true); + caseViewModel.obtainHandleCaseList(this, 1, true); break; case 1: binding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -295,7 +295,7 @@ binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核实数据 - caseViewModel.obtainVerifyCaseList(1000, 1, false); + caseViewModel.obtainVerifyCaseList(this, 1000, 1, false); break; case 2: binding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); @@ -303,7 +303,7 @@ binding.handleRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求待核查数据 - caseViewModel.obtainCheckCaseList(1000, 1, false); + caseViewModel.obtainCheckCaseList(this, 1000, 1, false); break; default: break; diff --git a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java index 623dca1..f456e3d 100644 --- a/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/WarningOnMapActivity.java @@ -76,7 +76,7 @@ int alarmTotal = (int) SaveKeyValues.getValue("alarmTotal", LocaleConstant.PAGE_LIMIT); alarmViewModel = new ViewModelProvider(this).get(AlarmViewModel.class); - alarmViewModel.obtainAlarmList(alarmTotal, 1); + alarmViewModel.obtainAlarmList(this, alarmTotal, 1); wellViewModel = new ViewModelProvider(this).get(WellViewModel.class); } @@ -104,7 +104,7 @@ List dataRows = alarmDataBean.getData().getRows(); for (AlarmDataBean.DataBean.RowsBean rowsBean : dataRows) { String queryParam = "编号='" + rowsBean.getWellCode() + "'"; - wellViewModel.obtainWellDetail(queryParam); + wellViewModel.obtainWellDetail(context, queryParam); } } } diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java index 1c26d11..06b0cb9 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/PipelineManagerActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -149,7 +151,7 @@ } private void obtainAlarmList() { - alarmViewModel.obtainAlarmList(LocaleConstant.PAGE_LIMIT, pageIndex); + alarmViewModel.obtainAlarmList(this, LocaleConstant.PAGE_LIMIT, pageIndex); } @Override @@ -200,8 +202,7 @@ }); } }; - //TODO -// binding.warningRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.warningRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.warningRecyclerView.setAdapter(adapter); } } @@ -214,7 +215,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelSingleAlarm(jobId, status, editReason); + alarmViewModel.cancelSingleAlarm(context, jobId, status, editReason); } @Override @@ -230,7 +231,7 @@ new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick(String status, String editReason) { - alarmViewModel.cancelBatchAlarm(status, editReason); + alarmViewModel.cancelBatchAlarm(context, status, editReason); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java index 9d0ac23..25fee91 100644 --- a/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/pipeline/WellListActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.pipeline; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.View; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; @@ -142,7 +144,7 @@ } private void obtainWellList() { - wellViewModel.obtainWellList(pageIndex); + wellViewModel.obtainWellList(this, pageIndex); } @Override @@ -217,8 +219,7 @@ }); } }; - //TODO -// binding.wellRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); + binding.wellRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.wellRecyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override @@ -244,7 +245,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateSingleWell(id, bfzt); + wellViewModel.operateSingleWell(context, id, bfzt); } @Override @@ -265,7 +266,7 @@ .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { @Override public void onConfirmClick() { - wellViewModel.operateBatchWell(bfzt); + wellViewModel.operateBatchWell(context, bfzt); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index c7ba951..cddfe96 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -100,8 +102,7 @@ .setText(R.id.caseNumView, item.getCaseNum()); } }; - //TODO -// binding.caseResourceView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.caseResourceView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseResourceView.setAdapter(recyclerAdapter); } } @@ -112,7 +113,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -123,7 +124,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseResource(startDate, endDate); + dataAnalysisViewModel.getCaseResource(context, startDate, endDate); } }).build().show(); } @@ -133,11 +134,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseResource(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseResource(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java index 2db7e0a..3854bd5 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CityBaseDataActivity.java @@ -51,7 +51,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { dataAnalysisViewModel = new ViewModelProvider(this).get(DataAnalysisViewModel.class); - dataAnalysisViewModel.getCityBaseData(); + dataAnalysisViewModel.getCityBaseData(this); dataAnalysisViewModel.cityBaseData.observe(this, new Observer() { @Override public void onChanged(CityBaseDataBean cityBaseDataBean) { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index b0452a9..2cf9e04 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -111,8 +113,7 @@ .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; - //TODO -// binding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.deptHandleView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.deptHandleView.setAdapter(recyclerAdapter); } } @@ -123,7 +124,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -134,7 +135,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getDeptHandleCondition(startDate, endDate); + dataAnalysisViewModel.getDeptHandleCondition(context, startDate, endDate); } }).build().show(); } @@ -144,11 +145,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getDeptHandleCondition(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getDeptHandleCondition(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java index 652b71c..f2aaffd 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/GridAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.ProgressBar; @@ -22,6 +23,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -85,8 +87,7 @@ progressBar.setProgress(rate); } }; - //TODO -// binding.gridAnalysisView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.gridAnalysisView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.gridAnalysisView.setAdapter(recyclerAdapter); //表格 @@ -100,8 +101,7 @@ .setText(R.id.closedNumView, item.getClosedNum()); } }; - //TODO -// binding.caseRecyclerView.addItemDecoration(new ItemDecoration(0f, 0f)); + binding.caseRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.caseRecyclerView.setAdapter(gridAdapter); } } @@ -126,7 +126,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -137,7 +137,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getGridAnalysis(startDate, endDate); + dataAnalysisViewModel.getGridAnalysis(context, startDate, endDate); } }).build().show(); } @@ -147,11 +147,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getGridAnalysis(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getGridAnalysis(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 8dbd2d5..4d1e8d6 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -23,6 +24,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -125,8 +127,7 @@ .setText(R.id.caseNumView, String.valueOf(item.getCaseNum())); } }; - //TODO -// binding.highEventCaseView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.highEventCaseView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.highEventCaseView.setAdapter(recyclerAdapter); } } @@ -154,7 +155,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -165,7 +166,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getHighFrequencyCase(startDate, endDate); + dataAnalysisViewModel.getHighFrequencyCase(context, startDate, endDate); } }).build().show(); } @@ -175,11 +176,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getHighFrequencyCase(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getHighFrequencyCase(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java index fcbe420..65e2b19 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/PunishAnalysisActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.view.statistics; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.RadioGroup; @@ -24,6 +25,7 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.RecyclerViewItemDivider; import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -79,8 +81,7 @@ .setText(R.id.caseNumView, item.getNum()); } }; - //TODO -// binding.rankingRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); + binding.rankingRecyclerView.addItemDecoration(new RecyclerViewItemDivider(1, Color.LTGRAY)); binding.rankingRecyclerView.setAdapter(recyclerAdapter); } } @@ -105,8 +106,8 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -117,8 +118,8 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getPunishTypeStatistic(startDate, endDate); - dataAnalysisViewModel.getPunishRanking(startDate, endDate); + dataAnalysisViewModel.getPunishTypeStatistic(context, startDate, endDate); + dataAnalysisViewModel.getPunishRanking(context, startDate, endDate); } }).build().show(); } @@ -128,14 +129,14 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getPunishTypeStatistic(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); - dataAnalysisViewModel.getPunishRanking(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishTypeStatistic(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getPunishRanking(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java index 0905187..552004f 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/TrendAnalysisActivity.java @@ -91,7 +91,7 @@ protected void onResume() { super.onResume(); //默认加载当前时间往前一个月的 - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(this, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } @Override @@ -102,7 +102,7 @@ new RangeDateActionSheet.Builder().setContext(context).setOnActionSheetListener(new RangeDateActionSheet.OnDateRangeSelectedListener() { @Override public void onDateRangeSelected(String startDate, String endDate) { - dataAnalysisViewModel.getCaseTendency(startDate, endDate); + dataAnalysisViewModel.getCaseTendency(context, startDate, endDate); } }).build().show(); } @@ -112,11 +112,11 @@ @Override public void onCheckedChanged(RadioGroup group, int checkedId) { if (checkedId == R.id.oneMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getOneMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else if (checkedId == R.id.threeMonthRadioButton) { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getThreeMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } else { - dataAnalysisViewModel.getCaseTendency(TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); + dataAnalysisViewModel.getCaseTendency(context, TimeOrDateUtil.getSixMonthDate(), LongHub.timestampToDate(System.currentTimeMillis())); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 9fadb5c..82ada76 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -142,7 +142,7 @@ } private void obtainCleanRecordList(String start, String end) { - toiletViewModel.obtainCleanRecordList(StringHelper.getUserBean().getId(), "", start, end, pageIndex); + toiletViewModel.obtainCleanRecordList(this, StringHelper.getUserBean().getId(), "", start, end, pageIndex); } private final Handler.Callback callback = msg -> { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 95259eb..842a428 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -233,7 +233,7 @@ @Override public void onSuccess(ArrayList result) { LocalMedia localMedia = result.get(0); - uploadViewModel.uploadImage(new File(localMedia.getCompressPath())); + uploadViewModel.uploadImage(context, new File(localMedia.getCompressPath())); } }); } @@ -304,7 +304,7 @@ StringHub.show(context, "保洁开始时间不能为空"); return; } - toiletViewModel.cleanToilet(toiletId, StringHelper.getUserBean().getId(), + toiletViewModel.cleanToilet(context, toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, binding.endTimeView.getText().toString(), imagePath, binding.workContentView.getText().toString()); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index c012915..a96f234 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -193,7 +193,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -228,7 +228,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -340,7 +340,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -380,7 +380,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 4527a75..ca1f4c5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -217,7 +217,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -259,7 +259,7 @@ return; } - caseViewModel.submitShopCase("0", "0", longitude, latitude, + caseViewModel.submitShopCase(this, "0", "0", longitude, latitude, "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 729e002..f4616bc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -336,7 +336,7 @@ @Override public void onFinish(boolean result) { if (result) { - uploadViewModel.uploadVideo(new File(outputVideoFile)); + uploadViewModel.uploadVideo(context, new File(outputVideoFile)); } else { StringHub.show(CommonCaseActivity.this, "请先选择案卷类型"); } @@ -390,7 +390,7 @@ dialog.dismiss(); binding.caseClassView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); //清空大小类 binding.caseLargeClassView.setText(""); binding.caseSmallClassView.setText(""); @@ -425,7 +425,7 @@ typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } else { @@ -641,7 +641,7 @@ } private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } /** @@ -681,7 +681,7 @@ return; } - caseViewModel.submitCase("0", "0", longitude, latitude, + caseViewModel.submitCase(this, "0", "0", longitude, latitude, "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), @@ -717,8 +717,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 7f67937..31ab95c 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -75,7 +75,7 @@ String id = getIntent().getStringExtra(Constant.INTENT_PARAM); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -216,8 +216,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index 8228db6..79304a3 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -171,7 +171,7 @@ smallTypeBeans = new ArrayList<>(); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.obtainCaseDetail(id); + caseViewModel.obtainCaseDetail(this, id); caseViewModel.caseDetailModel.observe(this, new Observer() { @Override public void onChanged(CaseDetailBean resultBean) { @@ -364,7 +364,7 @@ dialog.dismiss(); binding.caseTypeView.setText(tag); //获取案卷大类 - commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + commonDataViewModel.obtainLargeType(context, String.valueOf(position + 1)); } }).build().show(); } @@ -391,7 +391,7 @@ CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); - commonDataViewModel.obtainSmallType(eorc, typeId); + commonDataViewModel.obtainSmallType(context, eorc, typeId); } }).build().show(); } @@ -442,7 +442,7 @@ binding.caseConditionLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - nodeViewModel.obtainNextNode(String.valueOf(data.getCaseState())); + nodeViewModel.obtainNextNode(context, String.valueOf(data.getCaseState())); } }); @@ -513,7 +513,7 @@ }; private void handleSelectResult(LocalMedia obj) { - uploadViewModel.uploadImage(new File(obj.getRealPath())); + uploadViewModel.uploadImage(this, new File(obj.getRealPath())); } private void submitCase() { @@ -529,7 +529,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.checkCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList)); } else { //补全案卷 @@ -549,7 +549,7 @@ StringHub.show(context, "至少上传一张照片"); return; } - operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + operateViewModel.verifyCase(this, data.getProcessId(), id, String.valueOf(data.getCaseState()), changeState, remarks, StringHelper.reformatURL(imageList), eorc == null ? data.getEorc() : eorc, typeCode == null ? data.getCasetypeCode() : typeCode, @@ -587,8 +587,6 @@ @Override protected void onDestroy() { - //TODO -// binding.audioPlayerView.release(); if (isPlay) { binding.videoPlayerView.getCurrentPlayer().release(); } diff --git a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java index b91577c..af6de31 100644 --- a/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AlarmViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.AlarmDataBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData cancelActionModel = new MutableLiveData<>(); - public void obtainAlarmList(int limit, int offset) { + public void obtainAlarmList(Context context, int limit, int offset) { loadState.setValue(LoadState.Loading); Observable alarmListObservable = RetrofitServiceManager.getAlarmListResult(limit, offset); ObserverSubscriber.addSubscribe(alarmListObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { AlarmDataBean alarmDataBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void cancelSingleAlarm(String id, String jobStatus, String handleMessage) { + public void cancelSingleAlarm(Context context, String id, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(id, jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -75,24 +70,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -101,7 +92,7 @@ }); } - public void cancelBatchAlarm(String jobStatus, String handleMessage) { + public void cancelBatchAlarm(Context context, String jobStatus, String handleMessage) { Observable commonActionObservable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); ObserverSubscriber.addSubscribe(commonActionObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -111,24 +102,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); cancelActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java index ca36e00..b82ecf4 100644 --- a/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/AuthenticateViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PublicKeyBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData keyModel = new MutableLiveData<>(); - public void obtainPublicKey() { + public void obtainPublicKey(Context context) { Observable keyObservable = RetrofitServiceManager.authenticate(); ObserverSubscriber.addSubscribe(keyObservable, new ObserverSubscriber.OnObserverCallback() { @@ -37,11 +40,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PublicKeyBean keyDataBean = gson.fromJson(response, new TypeToken() { }.getType()); keyModel.setValue(keyDataBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java index 2ca5508..7d3d613 100644 --- a/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/BridgeViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.MaintainRecordBean; import com.casic.dcms.utils.StringHelper; @@ -15,7 +16,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -25,7 +25,7 @@ public MutableLiveData submitResultModel = new MutableLiveData<>(); public MutableLiveData recordModel = new MutableLiveData<>(); - public void submitMaintain(String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { + public void submitMaintain(Context context, String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getAddMaintainRecordResult(bridgeId, content, maintainTime, personId, longitude, latitude, description); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -37,18 +37,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -56,7 +51,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -65,7 +60,7 @@ }); } - public void obtainMaintainRecord(String startDate, String endDate, int offset) { + public void obtainMaintainRecord(Context context, String startDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getMaintainRecordResult(startDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -77,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MaintainRecordBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -96,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java index 9711544..8858527 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseOperateViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -28,7 +28,7 @@ public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + public void verifyCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -40,26 +40,20 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); verifyActionModel.setValue(resultBean); loadState.setValue(LoadState.Success); } else { - loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -68,7 +62,7 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + public void checkCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -80,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -99,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -108,7 +97,7 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + public void handleOvertimeCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -120,18 +109,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -139,7 +123,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -148,7 +132,7 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + public void handleShopCase(Context context, String id, String punishType, String punishRemarks, String punishTime, String punishImage) { Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -165,13 +149,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -180,7 +164,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -197,20 +181,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -221,7 +201,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -237,20 +217,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -261,7 +237,7 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { + public void updateCaseSupervise(Context context, String id, String superviseRemarks) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -273,18 +249,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -292,7 +263,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -301,7 +272,7 @@ }); } - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { + public void dispatcherHandleCase(Context context, String processId, String bizId, String currState, String changeState, String remarks, String approvalResult, String operationKey, String taskUserId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, approvalResult, operationKey, taskUserId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -313,18 +284,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -332,7 +298,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 3154ac6..f0eafec 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseCheckModel; import com.casic.dcms.model.CaseDetailBean; import com.casic.dcms.model.CaseHandleBean; @@ -24,7 +25,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -45,7 +45,7 @@ /** * 未核实、已核实 */ - public void obtainVerifyCaseList(int limit, int offset, boolean verified) { + public void obtainVerifyCaseList(Context context, int limit, int offset, boolean verified) { Observable observable; if (verified) { observable = RetrofitServiceManager.getVerifiedResult(limit, offset); @@ -67,7 +67,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (verified) { VerifiedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -78,6 +78,8 @@ }.getType()); caseVerifyModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -86,7 +88,7 @@ }); } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { + public void obtainCheckCaseList(Context context, int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { observable = RetrofitServiceManager.getCheckedResult(limit, offset); @@ -109,11 +111,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseCheckModel resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseCheckModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +126,7 @@ }); } - public void obtainHandleCaseList(int offset, boolean isOnMap) { + public void obtainHandleCaseList(Context context, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { observable = RetrofitServiceManager.handleCaseResult(1000, 1); @@ -144,11 +148,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandleBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandleModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +163,7 @@ }); } - public void obtainHandledCaseList(int offset) { + public void obtainHandledCaseList(Context context, int offset) { Observable observable = RetrofitServiceManager.handledCaseResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -174,11 +180,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseHandledBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseHandledModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -187,7 +195,7 @@ }); } - public void obtainUrgentCaseList(String isSupervise, int offset) { + public void obtainUrgentCaseList(Context context, String isSupervise, int offset) { Observable observable = RetrofitServiceManager.getUrgentCase(isSupervise, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -204,11 +212,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UrgentCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseUrgentModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -217,7 +227,7 @@ }); } - public void obtainOvertimeCaseList(String isOvertime, int offset) { + public void obtainOvertimeCaseList(Context context, String isOvertime, int offset) { Observable observable = RetrofitServiceManager.getOvertimeCase(isOvertime, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -234,11 +244,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { OvertimeCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseOvertimeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -247,7 +259,7 @@ }); } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { + public void obtainShopCaseList(Context context, String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); @@ -269,11 +281,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PackageCaseBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); shopCaseModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -282,7 +296,7 @@ }); } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { + public void searchCase(Context context, String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -294,18 +308,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSearchResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -313,7 +322,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -322,7 +331,7 @@ }); } - public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, @@ -339,20 +348,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -363,7 +368,7 @@ }); } - public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + public void submitShopCase(Context context, String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, int bzhours, int bzminis, String shopId, @@ -379,20 +384,16 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode != 200) { loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); } else { loadState.setValue(LoadState.Success); } @@ -403,7 +404,7 @@ }); } - public void obtainCaseDetail(String id) { + public void obtainCaseDetail(Context context, String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -415,18 +416,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -434,7 +430,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java index b575706..0685160 100644 --- a/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CommonDataViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseLargeTypeBean; import com.casic.dcms.model.CaseProcessBean; import com.casic.dcms.model.CaseSmallTypeBean; @@ -18,7 +19,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -31,7 +31,7 @@ public MutableLiveData sentenceModel = new MutableLiveData<>(); public MutableLiveData caseProcessModel = new MutableLiveData<>(); - public void obtainLargeType(String eorc) { + public void obtainLargeType(Context context, String eorc) { Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -48,11 +48,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseLargeTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); largeTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -61,7 +63,7 @@ }); } - public void obtainSmallType(String eorc, String typeId) { + public void obtainSmallType(Context context, String eorc, String typeId) { Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -78,11 +80,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseSmallTypeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); smallTypeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -91,7 +95,7 @@ }); } - public void obtainCaseStatus() { + public void obtainCaseStatus(Context context) { Observable observable = RetrofitServiceManager.getCaseStatus(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -108,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); caseStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -121,7 +127,7 @@ }); } - public void obtainCommonSentence() { + public void obtainCommonSentence(Context context) { Observable observable = RetrofitServiceManager.getCommonSentenceResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -138,11 +144,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ComSentenceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); sentenceModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -151,7 +159,7 @@ }); } - public void obtainCaseProcess(String processId) { + public void obtainCaseProcess(Context context, String processId) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseProcessResult(processId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -163,18 +171,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseProcessBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -182,7 +185,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java index 1f2f4b3..26209bc 100644 --- a/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DataAnalysisViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.CaseResourceBean; import com.casic.dcms.model.CaseTendencyBean; import com.casic.dcms.model.CityBaseDataBean; @@ -21,7 +22,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -37,7 +37,7 @@ public MutableLiveData typeStatisticData = new MutableLiveData<>(); public MutableLiveData rankingData = new MutableLiveData<>(); - public void getCityBaseData() { + public void getCityBaseData(Context context) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCityBaseData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -49,18 +49,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CityBaseDataBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -68,7 +63,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -77,7 +72,7 @@ }); } - public void getCaseResource(String begTime, String endTime) { + public void getCaseResource(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseResource(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -89,18 +84,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseResourceBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -108,7 +98,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -117,7 +107,7 @@ }); } - public void getHighFrequencyCase(String begTime, String endTime) { + public void getHighFrequencyCase(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getHighEvent(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -129,18 +119,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HighEventBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -148,7 +133,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -157,7 +142,7 @@ }); } - public void getDeptHandleCondition(String begTime, String endTime) { + public void getDeptHandleCondition(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getDeptHandleCondition(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -169,18 +154,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptHandleConditionBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -188,7 +168,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -197,7 +177,7 @@ }); } - public void getGridAnalysis(String begTime, String endTime) { + public void getGridAnalysis(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getGridAnalysis(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -209,18 +189,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { GridAnalysisBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -228,7 +203,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -237,7 +212,7 @@ }); } - public void getCaseTendency(String begTime, String endTime) { + public void getCaseTendency(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseTendency(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -249,18 +224,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseTendencyBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -268,7 +238,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -277,7 +247,7 @@ }); } - public void getPunishTypeStatistic(String begTime, String endTime) { + public void getPunishTypeStatistic(Context context, String begTime, String endTime) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getPunishTypeStatistic(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -289,18 +259,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishTypeStatisticBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -308,7 +273,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -317,7 +282,7 @@ }); } - public void getPunishRanking(String begTime, String endTime) { + public void getPunishRanking(Context context, String begTime, String endTime) { Observable observable = RetrofitServiceManager.getPunishRanking(begTime, endTime); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -334,7 +299,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PunishRankingBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java index b0ad747..14a15b7 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptCaseViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.dept.AdjustCaseModel; @@ -14,6 +16,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -31,7 +34,7 @@ public MutableLiveData deptDelayedCaseListModel = new MutableLiveData<>(); public MutableLiveData deptPostBeanCaseListModel = new MutableLiveData<>(); - public void obtainDeptStatusCaseList(int offset, String pageTag) { + public void obtainDeptStatusCaseList(Context context, int offset, String pageTag) { Observable observable; if (pageTag.equals("todo")) { // @@ -58,7 +61,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (pageTag.equals("todo")) { TodoCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -73,6 +76,8 @@ }.getType()); deptHandledCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -81,7 +86,7 @@ }); } - public void obtainDeptStatusCaseList(int offset, boolean isAdjust) { + public void obtainDeptStatusCaseList(Context context, int offset, boolean isAdjust) { Observable observable; if (isAdjust) { observable = RetrofitServiceManager.getCaseAdjustResult(offset); @@ -103,7 +108,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isAdjust) { AdjustCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -114,6 +119,8 @@ }.getType()); deptAuthorizeCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -122,7 +129,7 @@ }); } - public void obtainDelayedOrPostCaseList(int offset, boolean isDelayed) { + public void obtainDelayedOrPostCaseList(Context context, int offset, boolean isDelayed) { Observable observable; if (isDelayed) { observable = RetrofitServiceManager.getDelayedListResult(offset); @@ -144,7 +151,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { if (isDelayed) { DelayedCaseModel resultBean = gson.fromJson(response, new TypeToken() { @@ -155,6 +162,8 @@ }.getType()); deptPostBeanCaseListModel.setValue(resultBean); } + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java index 2f44fd8..c114bc2 100644 --- a/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/DeptTreeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.DeptTreeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData deptModel = new MutableLiveData<>(); - public void obtainDeptTree(String pid) { + public void obtainDeptTree(Context context, String pid) { Observable observable = RetrofitServiceManager.getDeptTree(pid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { DeptTreeBean deptTreeBean = gson.fromJson(response, new TypeToken() { }.getType()); deptModel.setValue(deptTreeBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java index 68bb753..50d3342 100644 --- a/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/HomePageViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.HomePageBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData homePageDataModel = new MutableLiveData<>(); - public void obtainHomePageData(String resourceType) { + public void obtainHomePageData(Context context, String resourceType) { Observable observable = RetrofitServiceManager.getHomePageData(resourceType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { HomePageBean homePageBean = gson.fromJson(response, new TypeToken() { }.getType()); homePageDataModel.setValue(homePageBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java index 8cbf7c3..f9eb368 100644 --- a/app/src/main/java/com/casic/dcms/vm/LightViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/LightViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LightListBean; import com.casic.dcms.model.LightMapBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import java.util.List; import okhttp3.ResponseBody; @@ -30,7 +30,7 @@ public MutableLiveData lightMapModel = new MutableLiveData<>(); public MutableLiveData lightDetailModel = new MutableLiveData<>(); - public void obtainLightList(int limit, int offset) { + public void obtainLightList(Context context, int limit, int offset) { Observable observable = RetrofitServiceManager.getLightListResult(limit, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -47,7 +47,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightListBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -60,7 +60,7 @@ }); } - public void controlLight(List lampIds, String controlType) { + public void controlLight(Context context, List lampIds, String controlType) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -72,18 +72,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -91,7 +86,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -100,7 +95,7 @@ }); } - public void obtainLightOnMap() { + public void obtainLightOnMap(Context context) { Observable observable = RetrofitServiceManager.getLightListResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,11 +112,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LightMapBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); lightMapModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -130,7 +127,7 @@ }); } - public void obtainLightDetail(String lampId) { + public void obtainLightDetail(Context context, String lampId) { Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override diff --git a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java index caa6038..fb516b0 100644 --- a/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/MapConfigViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.MapConfigModel; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData mapConfigModel = new MutableLiveData<>(); - public void obtainMapConfig() { + public void obtainMapConfig(Context context) { Observable observable = RetrofitServiceManager.getMapConfig(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { MapConfigModel configBean = gson.fromJson(response, new TypeToken() { }.getType()); mapConfigModel.setValue(configBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java index b2b3439..f6c296e 100644 --- a/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/NodeViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.CaseNextNodeBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData nodeModel = new MutableLiveData<>(); - public void obtainNextNode(String caseState) { + public void obtainNextNode(Context context, String caseState) { Observable observable = RetrofitServiceManager.getProcessNextNodeResult(caseState); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CaseNextNodeBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); nodeModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java index f485b50..a667ec3 100644 --- a/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PersonViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PersonStatusBean; @@ -9,6 +11,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -21,7 +24,7 @@ public MutableLiveData personStatusModel = new MutableLiveData<>(); public MutableLiveData processPersonModel = new MutableLiveData<>(); - public void obtainPersonByStatus(String deptid, String roleTips, String isOnLine) { + public void obtainPersonByStatus(Context context, String deptid, String roleTips, String isOnLine) { Observable observable = RetrofitServiceManager.getOnlinePerson(deptid, roleTips, isOnLine); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -38,11 +41,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PersonStatusBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); personStatusModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -51,7 +56,7 @@ }); } - public void obtainSubordinatePerson() { + public void obtainSubordinatePerson(Context context) { Observable observable = RetrofitServiceManager.getProcessPersonResult(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -68,11 +73,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ProcessPersonBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); processPersonModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java index 43283bd..91eecb6 100644 --- a/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PhoneBookViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.PhoneBookBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; @@ -20,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData phoneBookModel = new MutableLiveData<>(); - public void obtainPhoneBook(String deptid) { + public void obtainPhoneBook(Context context, String deptid) { Observable observable = RetrofitServiceManager.getPhoneBook(deptid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -37,14 +40,14 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { PhoneBookBean phoneBookBean = gson.fromJson(response, new TypeToken() { }.getType()); phoneBookModel.setValue(phoneBookBean); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java index 2f8c3f5..570b195 100644 --- a/app/src/main/java/com/casic/dcms/vm/PushViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/PushViewModel.java @@ -1,5 +1,7 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; import com.casic.dcms.model.ActionResultBean; @@ -8,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; @@ -19,7 +22,7 @@ private final Gson gson = new Gson(); public MutableLiveData commonActionModel = new MutableLiveData<>(); - public void registerPush(String clientid) { + public void registerPush(Context context, String clientid) { Observable observable = RetrofitServiceManager.getRegisterResult(clientid); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -36,11 +39,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); commonActionModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java index 3860a02..ad33409 100644 --- a/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ShopViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData changeResultModel = new MutableLiveData<>(); - public void changeShopInfo(String merchantId, String merchantName, String contactName, String contactPhone, String images) { + public void changeShopInfo(Context context, String merchantId, String merchantName, String contactName, String contactPhone, String images) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getShopChangeResult(merchantId, merchantName, contactName, contactPhone, images); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -35,18 +35,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -54,7 +49,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java index 81e0010..28c88b3 100644 --- a/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/ToiletViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.CleanRecordBean; import com.casic.dcms.model.ToiletListModel; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -27,7 +27,7 @@ public MutableLiveData cleanToiletModel = new MutableLiveData<>(); public MutableLiveData cleanRecordModel = new MutableLiveData<>(); - public void getToilets() { + public void getToilets(Context context) { Observable observable = RetrofitServiceManager.getToilets(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -44,11 +44,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ToiletListModel listBean = gson.fromJson(response, new TypeToken() { }.getType()); toiletListModel.setValue(listBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -57,7 +59,7 @@ }); } - public void cleanToilet(String toiletId, String userId, String lng, String lat, String startTime, String endTime, String photo, String workContent) { + public void cleanToilet(Context context, String toiletId, String userId, String lng, String lat, String startTime, String endTime, String photo, String workContent) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCleanToiletResult(toiletId, userId, lng, lat, startTime, endTime, photo, workContent); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -69,18 +71,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -88,7 +85,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -97,7 +94,7 @@ }); } - public void obtainCleanRecordList(String userId, String keywords, String beginDate, String endDate, int offset) { + public void obtainCleanRecordList(Context context, String userId, String keywords, String beginDate, String endDate, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCleanRecordResult(userId, keywords, beginDate, endDate, offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -109,18 +106,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { CleanRecordBean listBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -128,7 +120,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java index 401dd96..6da77c7 100644 --- a/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UploadViewModel.java @@ -1,26 +1,29 @@ package com.casic.dcms.vm; +import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.Color; import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; -import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IWaterMarkAddListener; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.annotations.WaterMarkPosition; import com.pengxh.androidx.lite.base.BaseViewModel; +import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.FloatHub; +import com.pengxh.androidx.lite.hub.LongHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.ObserverSubscriber; +import com.pengxh.androidx.lite.utils.WaterMarkerEngine; import java.io.File; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -32,7 +35,7 @@ public MutableLiveData audioModel = new MutableLiveData<>(); public MutableLiveData videoModel = new MutableLiveData<>(); - public void uploadPosition(String imei, String positionLat, String positionLng) { + public void uploadPosition(Context context, String imei, String positionLat, String positionLng) { Observable observable = RetrofitServiceManager.getPositionUploadResult(imei, positionLat, positionLng); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -49,11 +52,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); commonActionModel.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -62,58 +67,63 @@ }); } - public void uploadImage(File file) { + public void uploadImage(Context context, File file) { + File compressImageDir = ContextHub.createCompressImageDir(context); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(bitmap, new IWaterMarkAddListener() { - @Override - public void onSuccess(File file) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.uploadImage(file); - ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { + new WaterMarkerEngine.Builder() + .setOriginalBitmap(bitmap) + .setTextMaker(LongHub.timestampToCompleteDate(System.currentTimeMillis()) + System.lineSeparator() + StringHelper.getUserBean().getAccount()) + .setTextColor(Color.RED) + .setTextSize(FloatHub.sp2px(context, 24)) + .setTextMargin(FloatHub.dp2px(context, 30)) + .setMarkerPosition(WaterMarkPosition.RIGHT_BOTTOM) + .setMarkedSavePath(compressImageDir + File.separator + System.currentTimeMillis() + ".png") + .setOnWaterMarkerAddedListener(new WaterMarkerEngine.OnWaterMarkerAddedListener() { @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); + public void onStart() { + } @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - imageModel.setValue(resultBean); + public void onMarkAdded(File file) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.uploadImage(file); + ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { + @Override + public void onCompleted() { loadState.setValue(LoadState.Success); - } else { + } + + @Override + public void onError(Throwable e) { loadState.setValue(LoadState.Fail); } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - @Override - public void onError(Throwable e) { - e.printStackTrace(); - } - }); + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.getResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + imageModel.setValue(resultBean); + loadState.setValue(LoadState.Success); + } else { + loadState.setValue(LoadState.Fail); + StringHub.show(context, StringHelper.getResponseMessage(response)); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + }).build().start(); } - public void uploadAudio(File file) { + public void uploadAudio(Context context, File file) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.uploadAudio(file); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -125,18 +135,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -144,7 +149,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -153,7 +158,7 @@ }); } - public void uploadVideo(File file) { + public void uploadVideo(Context context, File file) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.uploadVideo(file); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -165,18 +170,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -184,7 +184,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java index ca64e7c..0a172c2 100644 --- a/app/src/main/java/com/casic/dcms/vm/UserViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/UserViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.LoginResultBean; import com.casic.dcms.model.UserBean; @@ -18,10 +19,8 @@ import com.pengxh.androidx.lite.utils.SaveKeyValues; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; -import retrofit2.HttpException; import rx.Observable; public class UserViewModel extends BaseViewModel { @@ -33,7 +32,7 @@ public MutableLiveData changePwdResult = new MutableLiveData<>(); public MutableLiveData updateResult = new MutableLiveData<>(); - public void getUserData() { + public void getUserData(Context context) { Observable observable = RetrofitServiceManager.getUserData(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -50,7 +49,7 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { UserBean userBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -70,7 +69,7 @@ }); } - public void login(String username, String key) { + public void login(Context context, String username, String key) { loadState.setValue(LoadState.Loading); Observable loginObservable = RetrofitServiceManager.login(username, key); ObserverSubscriber.addSubscribe(loginObservable, new ObserverSubscriber.OnObserverCallback() { @@ -82,21 +81,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - //TODO 最好是通过错误码判断，但是需要后台配合修改 - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else if (e instanceof HttpException) { - StringHub.show(BaseApplication.get(), "用户已锁定，请联系管理员"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { LoginResultBean loginResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -104,7 +95,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -113,7 +104,7 @@ }); } - public void loginOut() { + public void loginOut(Context context) { Observable observable = RetrofitServiceManager.loginOut(); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -130,11 +121,13 @@ public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); loginOutResult.setValue(resultBean); + } else { + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -143,7 +136,7 @@ }); } - public void changePassword(String oldPwd, String newPwd) { + public void changePassword(Context context, String oldPwd, String newPwd) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getChangePasswordResult(oldPwd, newPwd); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -155,18 +148,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -174,7 +162,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -183,7 +171,7 @@ }); } - public void updateUserInfo(String id, String account, String name, String deptid, String roleid, String avatar, String sex, String birthday, String phone) { + public void updateUserInfo(Context context, String id, String account, String name, String deptid, String roleid, String avatar, String sex, String birthday, String phone) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.updateUserInfo(id, account, name, deptid, roleid, avatar, sex, birthday, phone); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -195,18 +183,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean actionResultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -214,7 +197,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java index 0c28086..e1d127c 100644 --- a/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/VersionViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.NewVersionBean; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; @@ -14,7 +15,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -23,7 +23,7 @@ private final Gson gson = new Gson(); public MutableLiveData versionModel = new MutableLiveData<>(); - public void update() { + public void update(Context context) { loadState.setValue(LoadState.Loading); Observable loginObservable = RetrofitServiceManager.updateVersion(); ObserverSubscriber.addSubscribe(loginObservable, new ObserverSubscriber.OnObserverCallback() { @@ -35,18 +35,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { NewVersionBean versionBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -54,7 +49,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/casic/dcms/vm/WellViewModel.java b/app/src/main/java/com/casic/dcms/vm/WellViewModel.java index 267515f..574e05a 100644 --- a/app/src/main/java/com/casic/dcms/vm/WellViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/WellViewModel.java @@ -1,8 +1,9 @@ package com.casic.dcms.vm; +import android.content.Context; + import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.model.ActionResultBean; import com.casic.dcms.model.WellDetailBean; import com.casic.dcms.model.WellListBean; @@ -16,7 +17,6 @@ import com.pengxh.androidx.lite.utils.ObserverSubscriber; import java.io.IOException; -import java.net.ConnectException; import okhttp3.ResponseBody; import rx.Observable; @@ -27,7 +27,7 @@ public MutableLiveData resultModel = new MutableLiveData<>(); public MutableLiveData operationActionModel = new MutableLiveData<>(); - public void obtainWellList(int offset) { + public void obtainWellList(Context context, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getWellListResult(offset); ObserverSubscriber.addSubscribe(observable, new ObserverSubscriber.OnObserverCallback() { @@ -39,18 +39,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { WellListBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -58,7 +53,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -67,7 +62,7 @@ }); } - public void obtainWellDetail(String queryParam) { + public void obtainWellDetail(Context context, String queryParam) { loadState.setValue(LoadState.Loading); Observable wellDetailObservable = RetrofitServiceManager.getWellDetailResult(queryParam); ObserverSubscriber.addSubscribe(wellDetailObservable, new ObserverSubscriber.OnObserverCallback() { @@ -79,18 +74,13 @@ @Override public void onError(Throwable e) { loadState.setValue(LoadState.Fail); - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { WellDetailBean detailBean = gson.fromJson(response, new TypeToken() { }.getType()); @@ -98,7 +88,7 @@ loadState.setValue(LoadState.Success); } else { loadState.setValue(LoadState.Fail); - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -107,7 +97,7 @@ }); } - public void operateSingleWell(String wellId, String bfzt) { + public void operateSingleWell(Context context, String wellId, String bfzt) { Observable wellDetailObservable = RetrofitServiceManager.getSingleOptionWellResult(wellId, bfzt); ObserverSubscriber.addSubscribe(wellDetailObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -117,24 +107,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); operationActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace(); @@ -143,7 +129,7 @@ }); } - public void operateBatchWell(String bfzt) { + public void operateBatchWell(Context context, String bfzt) { Observable wellDetailObservable = RetrofitServiceManager.getBatchOptionWellResult(bfzt); ObserverSubscriber.addSubscribe(wellDetailObservable, new ObserverSubscriber.OnObserverCallback() { @Override @@ -153,24 +139,20 @@ @Override public void onError(Throwable e) { - if (e instanceof ConnectException) { - StringHub.show(BaseApplication.get(), "连接失败，请检查网络或者服务器"); - } else { - StringHub.show(BaseApplication.get(), "服务器异常，请联系管理员"); - } + } @Override public void onNext(ResponseBody responseBody) { try { String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); + int responseCode = StringHelper.getResponseCode(response); if (responseCode == 200) { ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { }.getType()); operationActionModel.setValue(resultBean); } else { - StringHelper.showErrorMessage(response); + StringHub.show(context, StringHelper.getResponseMessage(response)); } } catch (IOException e) { e.printStackTrace();